resolve merge conflict

welcome to shbcf.ru